From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 13 Feb 2014 21:32:48 +0000 (+0100)
Subject: ShellApp: remove impossible check
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2752
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d555fd7883bfe1932d5dfff8309b6dacae62d362;p=gnome-shell.git

ShellApp: remove impossible check

The action muxer is created and destroyed with the running state,
it can never be NULL.

https://bugzilla.gnome.org/show_bug.cgi?id=722554
---

diff --git a/src/shell-app.c b/src/shell-app.c
index aed49f01e..e2f3c713f 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -611,9 +611,7 @@ shell_app_update_window_actions (ShellApp *app, MetaWindow *window)
           g_object_set_data_full (G_OBJECT (window), "actions", actions, g_object_unref);
         }
 
-      if (!app->running_state->muxer)
-        app->running_state->muxer = gtk_action_muxer_new ();
-
+      g_assert (app->running_state->muxer);
       gtk_action_muxer_insert (app->running_state->muxer, "win", actions);
       g_object_notify (G_OBJECT (app), "action-group");
     }